hplip: update to 3.25.6

Add patch to fix compilation with GCC15.

Signed-off-by: Rosen Penev <[email protected]>

diff --git a/utils/hplip/Makefile b/utils/hplip/Makefile
index 57e2359050633e9a4956f8b2b26a5f0e987e5d9d..2c41e01e0da8059be6b56ecb3ef135964932a69d 100644 (file)
--- a/utils/hplip/Makefile
+++ b/utils/hplip/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hplip
-PKG_VERSION:=3.24.4
+PKG_VERSION:=3.25.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/hplip
-PKG_HASH:=5d7643831893a5e2addf9d42d581a5dbfe5aaf023626886b8762c5645da0f1fb
+PKG_HASH:=a6af314a7af0572f2ab6967b2fe68760e64d74628ef0e6237f8504d81047edbe
 
 PKG_MAINTAINER:=Luiz Angelo Daros de Luca <[email protected]>
 PKG_LICENSE:=GPL-2.0 GPL-2.0-or-later

diff --git a/utils/hplip/patches/010-libusb_fix.patch b/utils/hplip/patches/010-libusb_fix.patch
index 5fad9a0bb9ab1f0dd397e5c8cf4d887be8b19c66..a33b3f5b35d118637b0b00952ebb4f275cde0196 100644 (file)
--- a/utils/hplip/patches/010-libusb_fix.patch
+++ b/utils/hplip/patches/010-libusb_fix.patch
@@ -9,7 +9,7 @@
  libhpmud_la_LDFLAGS += -lusb-1.0
  endif
  
-@@ -365,7 +365,7 @@ hpmudext_la_CFLAGS += -Iprotocol/discove
+@@ -366,7 +366,7 @@ hpmudext_la_CFLAGS += -Iprotocol/discove
  endif
  
  if !LIBUSB01_BUILD
@@ -20,7 +20,7 @@
  # ui (qt3)
 --- a/configure.in
 +++ b/configure.in
-@@ -625,6 +625,10 @@ if test "$class_driver" = "no" && test "
+@@ -627,6 +627,10 @@ if test "$class_driver" = "no" && test "
     else
        AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)])
        AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)])

diff --git a/utils/hplip/patches/060-gcc15.patch b/utils/hplip/patches/060-gcc15.patch
new file mode 100644 (file)
index 0000000..6c6b1f2
--- /dev/null
+++ b/utils/hplip/patches/060-gcc15.patch
@@ -0,0 +1,11 @@
+--- a/scan/sane/ledmi.h
++++ b/scan/sane/ledmi.h
+@@ -162,7 +162,7 @@ struct ledm_session
+ int bb_open(struct ledm_session*);
+ int bb_close(struct ledm_session*);
+ int bb_get_parameters(struct ledm_session*, SANE_Parameters*, int);
+-int bb_is_paper_in_adf();         /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
++int bb_is_paper_in_adf(struct ledm_session*);         /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
+ SANE_Status bb_start_scan(struct ledm_session*);
+ int bb_get_image_data(struct ledm_session*, int); 
+ int bb_end_page(struct ledm_session*, int);

diff --git a/utils/hplip/patches/070-respect-cflags.patch b/utils/hplip/patches/070-respect-cflags.patch
index 6853cb878aa4cbfe8dbbf144c91ffb6539d87074..dd583be98bd69b2b45d23356fd3e0045cac78076 100644 (file)
--- a/utils/hplip/patches/070-respect-cflags.patch
+++ b/utils/hplip/patches/070-respect-cflags.patch
@@ -1,6 +1,6 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -632,14 +632,14 @@ if test "$class_driver" = "no" && test "
+@@ -634,14 +634,14 @@ if test "$class_driver" = "no" && test "
     fi
  fi
  
@@ -18,7 +18,7 @@
     then
     echo $FLAGS
     fi
-@@ -668,7 +668,7 @@ if test "$class_driver" = "no" && test "
+@@ -687,7 +687,7 @@ if test "$class_driver" = "no" && test "
     AS_IF([test "x$FOUND_HEADER" != "xyes"],
            [AC_MSG_ERROR([cannot find python-devel support], 6)])
  fi